astar added !
resolve conflict