Remove file from conflict