merge dit not do the right thing