apparently i left in some merge conflict markers
add notes to each section
Merge branch 'master' into solutions