removed text

this conflict keeps happening, hopefully its the last of it