Add merge conflicts

unexpected token tRSHFT