Modified EntityEqualityComparer, added an option to merge on update