merge all the changes