merged some error