be clobbered
manual merge