Finish Merge b

I lied.