Added comment need to make a conflict
Added comment on Hotfix to conflict
mereged fix 21 to hotfix
Added file me.txt
Changed comments in me.txt
Changed a few comments on me.txt to make a conflict
Added a comment in me.txt to create a conflict
Added comments to make a conflict
Added comments to make a c@@@@@@@@@
Merged
Changes added to new file