rock paper scissors added
merge