fix unresolved conflict