Changed gitignore for merge