discarded original changes, commit to pull
commit to enable pull
fixed conflicts
resolved conflicts and name issues
added checkboxes for detective notes