initial commit
conflict gitignore