Conflict/landen test#13

landen-ccm wants to merge 2 commits intotestlanden-ccm/git-practice:testfrom

conflict/landen-testlanden-ccm/git-practice:conflict/landen-testCopy head branch name to clipboard