resolving conflicts is hard
can I do this?
Merge branch 'ale' of https://github.com/alosada/the_log into ale