f
hello to the user in the header of the page : and in the up of the body
fix conflicts