resolved merge conflict, code lint
jquery 1.9