Merging my own gitignore with the cloned