merge of 3/11