Resolve of merge conflicts