fix merging + layout