merging
merge done
windows fix