And now merging correctly