Merge the 7 commits