image for merge conflicts is backwards + typo

[lindsayplatt]

Drew in #software_dev USGS Slack pointed these out

2. there may be typo with 'independed' in the doc too