Implemented AStarSearch
Fixed merge