commit after init
git test
fix merge conflict