there was no merge conflict, so recommit