update changes
merge and update changes