Better layout for merge