Use fetch, and ff-only merge