remove backup file of conflict