Merging layout changes