Minor changes to the writeup
Fixed merge differences in writeup.