Modified .gitignore to ignore merge originals