Merge recent commits