Merge conflict

# edit the file and fix the conflict

git add .

git comiit

Note: This commit will have two parents where there has been a merge.