stuff
resolved merge conflict on init_pushmenu.js