Clean up.
Merge branch 'master' of https://github.com/freko247/conflictMapping