merge
resolve conflict
replace with my id
modify example
Merge branch 'master' of github.com:11693-5/project-team5