Resolvido os conflitos no AStar