Fix unresolved conflicts