Tweaked Heuristic

It was timing out, so we made some speed ups, but more still need to be
made.
Fixed Conflicts