work on startpagedesign
conflicts done