More issues with merging versions - solved?