Fix Scala Aggregate Op SQUASH BEFORE MERGING