changed profilpicture of sam
resolved merge conflict