Determine location
userInfo
userInfo
Merge remote-tracking branch 'origin/master'

Conflicts: