resolved merge conflicts, memes controller complete