ff merge only