fix unresolved merge