update the gitignore
up
resolve conflicts