Line-by-Line Merge of Two Branches

Company: Atlassian_28oct

Difficulty: easy