Fix unresolved conflict