make ggr preserve merges; add ggR for old behavior