upgrade pathfinding
merge conflicts