basic layout
fixing merge