troubleshooting
fixed a tag
Merge pull request #41 from RTakes/conflict-res

Conflict res
Merge pull request #42 from COPPER-BOBCAT/staging

Staging