Merge and changes