conflict resolution for 2013-11-15 merge