-
.gitignore idea
manual conflict resolution