Merge the new theme commit.
Merge the branches.