Manually fix CLOUD merge