recommit
resolving conflict