changed file modes
merge conflict resolution