Merge all the changes!