add git
update Git
fix somemistakes
merge conflict