Merging Rift Up Changes