Continue Merge conflict resolution