add window sir
merge the conflict