Fixed infinite loop in Astar.
Fixed conflicts.