initial merge with main layout