recommit to avoid conflicts