trying to reset my repo because of a conflict that i dont understand
Merge branch 'RobustReadme'
Merge branch 'RobustReadme'
Merge branch 'RobustReadme'
Merge branch 'master' into RobustReadme