Merge layout changes