Fixed weird emrge
Actually fixed layout merge