stuff
fixed merges, printinventory works