Lessons Learned: Merging Branches