Recommit to fix conflict