Reslove conflicts & add new unit test

Merged Wang Yuyang requested to merge Reslove-conflicts-&-Add-new-UnitTest into master

Merge request reports