Merge done correctly