removing conflicts