Mergeconflict first conflicting change