• Approach 1: merge
• Approach 2: rebase