took out actual text replace logic
merge conflict