modifying my own version without updating
conflict needs resolving

Merge branch 'master' of https://github.com/knightjar/papers
another attempt to create conflict via deletion
more conflicts to sort out
Merge branch 'master' of https://github.com/knightjar/papers
trying harder
conflict resolved?