unbotch merge?