added linear conflict to Manhattan heuristic