Fixed more issues with merging