[SD-1119] fixing the code are merge conflict.

close #389