updated error

merge