fixing the pull/merge problem, some text edits