Merged correctly