FINALLY, resolved merge conflict, SANITIZED user input, added enter key ...

...listener. I hate git.