merged incorrectly