fixed row issue
merge