Fixed an issue with merging