conflicts on my machine - I recommit it