fix window errors
fix conflicts