cleaned up merge backup files