added wahwah and resolved merge conflicts