branch B after C merge1