Committing text in the right place this time.
Fixing merge conflict