Fix issues with merging