Who United Upper and Lower Egypt?

Some say Narmer and some say Menes. He was the first to unite upper and lower Egypt creating one of the first AMP (African Mode of Production) state.