Merge branch 'master' of C:\Infotex with conflicts.
Merge remote-tracking branch 'origin/master'