first commit from windows machine
Fixed the merge conflicts