Add git conflict map, return result for CONFLICT_MERGED
Use MERGED by default, ensure it isn't set to read only