Fixed semicolon popping out paren early
Resolved merge conflicts