changes message
All conflicts are merge