Should this read "branch.master.merge"?