Pull new
Conflict in gitignore