Change error definition
Solve bugs in master
resolve coonflict