Bad merge manual fix