first version
resolve merge conflict on .gitignore