Squashing commits for the secondary toolbar