An edit to text merge conflicts