conflict part 1
Merge branch 'master' of https://github.com/guyrt/laughing-octo-avenger