New Test and merge conflict resolution