Fix unresolved merge conflict