Finished writeup
fix merge conflicts (maybe?)