explicitly pull --ff-only from develop