Changing text
Resolve conflict