Restrict character entry
Fix merge conflicts