Fix unresolved merge conflicts