Merging recent commits