added test for text conflicts