add a git
fix the conflicts