Fixed merge errors ad oe type error i test.hsy