Fixed weird conflict in gitignore