[Feature]Fix Merge error

Change-Id: I5a850ffca2960fae776849f8709966ee7beaefbb
1 file changed