update layout partials
Fix merge conflict