error generation development
fixed merge conflict