Testing repo to understand git/github better (particularly merge conflicts)