delete the conflit file