edit on windows
merge conflict resolved on windows