Redid conflict detection. Not sure if it's done yet.