unbroke the merge