Merge the gitignore files together