Fixed the merge gitignore.