Fixing user input snippet
Fixing merge error