Merging complete

Yay!