clean start
.gitignore
merge