fixing bug
missing <<
fixing some conflicts