fixed syntax errors
 resolved merge conflicts