added A* algorithm blueprint
fixed merge conflict