Merge to next with --no-ff