Resolve the conflicts and add support for top hash aggregate and local s...

...erial agg