Added .orig and .base to .gitignore to prevent the merge conflict from creating files