Remove unresolved merge conflict