Layout changes for better merge