Bug fix and style update in AStar.hpp.
Dealt with merge error.