solved conflict
Pathfinder solved
Merge branch 'master' of https://github.com/Dragonborns/crtman