Add conflict_map to git
For conflicts, use MERGED by default, don't change permissions if file is the same