Treat all files as binary to avoid conflicts

All files should be treated as binary fiiles, to avoid merging, conflicts, and etc. Simply the most recently modified file should be kept. It is also acceptable to rename the old one (like bazaar already does)