Recommit to clear conflict