fix merging issues