modified file2 in hotfix on Win8
fixed conflict on file2 in hotfix on win8