can't do a merge to save my life