conflict resolved windows

conflict resolved