Always push manually
Staying up-to-date with a remote copy
Merge remote-tracking branch 'origin/master'
Conflicts: lesson_3_reflection.txt