Fixing unresolved conflict markers