Fixes merge conflicts.
Merge branch 'master' of https://github.com/steveclancy/legit