windows clarification
conflict resolve