tidy of design
some meaningful message about the work you done this time
attempt at fixing merge