fix merge conflict
Merge branch 'master' of github.com:eecs441group/Quack