move menu over
fix merge conflicts