what did I change??
Merge remote-tracking branch 'origin/master'
I don't know what it's doing
Merge branch 'master' of https://github.com/CadenceHealth/Resources