fix merging