adding some seriously fun teachability
cleaning up conflicts..
cleaning up conflicts..