Add merge conflicts

unexpected token tEQQ