initial template
resolve conflict in gitignore