Fix merge ybonnel