remove conflict flag on README.md
add my name and team name to README.md