first commit
merge conflict with default files in new repo