submit text changes
merged conflicts