Merge recent window changes