fix error status in GridView
merge update