merge with new layout