hello Starting with git Updating the master branch Pulling from the remote repository <<<<<<< HEAD Making some changes on the local repository ======= Making changes also on the remote repository c8383c3999d6c8dee8152704f99664e1502473dc