cover input error cases
fix conflict