added user input feature
updated merge