conflicts clear