changes to writeup
merge conflicts