commit resolv conflit