LearningGit Text from website Text from local Again from local --latest change --latest change 2 <<<<<<< HEAD -- lort --lort 1 019c1c2594852547405c8a652cc7092528614208