Merge UnitController with SquareListener