first commit
remove conflict gitignore