Fix wrong merging