adding a title to solutions and redoing the layout
fixing merge conflicts