FINALLY, I GOT IT TO WORK
Merge remote-tracking branch 'origin/master'