git init
git commit
merge
fix naming convention