Fixed issue with merging