11 integration test resolves conflicts#36

Merged

wyli merged 11 commits intomasterfrom

11-integration-test-resolves-conflicts

Feb 4, 2020

Commits on Jan 17, 2020

Commits on Jan 23, 2020

Commits on Jan 24, 2020

Commits on Jan 25, 2020

fixes ci test
wyli
committed

Commits on Feb 3, 2020

This is just for test if public gitlab CI works. Please ignore this.
IsaacYangSLA
committed

Commits on Feb 4, 2020