Removing conflict message