gitignore
solved conflict