fixed issues on platform_pc
fixed merge issue