practice remove conflict
commit
tefu's test commit
conflict removed
commit
test branch2
Merge branch 'branch2' of github.com:finleyltf/FusionSquare into staging
remove all test file
Initial report added