Updated merge conflicts. Updated evaluation journal.