Final commit, merge is complete