fixing issues with merging