Bad merge?