Working on user input loop
Fix conflicts