don't show error if trying to type in other field
Merge remote-tracking branch 'origin/master'