"init commit"
"added .gitignore"
"Fixed merge conflicts"