Fixed it to run across multiple windows, including refresh- and unpin- all
trying to fix these conflicts
I think the conflicts should be resolved now