Resolved conflicts with new path finding