Fix unresolved merge