add git remote operations
fix the conflict