clear conflicts (does not affect code)