recommit to avoid merge conflicts