commit for merge master
.gitignore
merger with checkout