Merging older commits