greggman merges