updated layout
updated merge