Merging branch for timestamped updates