A conlficting comment with 'merge_with_two_commits' branch#46

soonum wants to merge 1 commit intomastersoonum/caesar-cipher:masterfrom

merge_failsoonum/caesar-cipher:merge_failCopy head branch name to clipboard