Class header
.gitignore
conflicts