fixing unresolved conflict