finished
some more notes
fixed merge conflict