Removed an old conflict management artifact.
Merge branch 'master' of github.com:golvmopp/sdmapeg