rename rule changes to fetch, ensure merge is ff-only for rebase-firemind