fix issues with merging