DF-1411 merged conflict