clear conflicts