Fix gitignore previous confliction