merged Stamp
merge continuing
finished merge, but untested