all changes
final changes of conflict