Fixed windows build with conflict resolve