feature: mergeCell

And some minor format changes / bug fixes