Fix image order in novice/git/03-conflict.md

Corrects the order of the images in the Git Conflicts section. Addresses #573.