FINALLY, resolved merge conflict, sanitized user input, added enter key listener. I hate git.