merge error? or maybe I just accidentally hit undo before committing?