Merge "Moved textbox1 building into TextConflictHelper on edit conflicts"