clearing conflicts