unresolved merge conflict fixed