11-2-14 merge