Finishing up, merging back