Revised the files to fix the text added by the merge