Conflict marking in Apex properties

Mark as conflict in apex properties when dates don't match, bug fix for
successful save, rename method