1. Conflict

2. Merge

3. Rebase

4. Cherry-pick