Merge branch 'master' of D:\Games\OpenServer\domains\uybor.loc with conflicts.