image name was wrong case

[lindsayplatt]

those were actually saved with .PNG, so you need to change the file, too

https://github.com/USGS-R/training-curriculum/blob/master/content/r-package-dev/static/img/merge_conflict_code.PNG

[lindsayplatt]

there are two of instances:

merge_conflict_code.PNG merge_conflict_git_tab.PNG

[wdwatkins]

It's merge_conflict_shell.png though, those other two are fine.

[lindsayplatt]

ohhhhhhhh sorry!