Corrected Merge Conflicts

Posted a note on the facebook group about merge conflicts. Corrected
code in several areas.
-Travis