Some Merging Problems

Added back in some text that disappeared from some merging issues.