init git
fix conflict in readme file