Fix the merge conflict plus add in my windows path