init commit
init commit with gitignore
merge resolution