merge changes, add z-column, add top-right legend