Clear conflicts for opening a new file