Merge vasya&dh