Add merge conflicts

unexpected token tLSHFT