added textchanges after fixed merge error