Hopefully this fixes things?
removing conflicts