Update
Resolve conflict
Update gitignore