Fixing some issues with merging