Clear conflicts for loading a new file