add new row dev2
merge&fix