Fix do merge