merge takes one array as a paramater
uncommented the completed merge
Merge branch 'master' of github.com:stuycs-apcs-z/hw
finished merge
Merge branch 'master' of github.com:stuycs-apcs-z/hw
Merge branch 'master' of github.com:stuycs-apcs-z/hw