Support --no-ff