Git conflict solved

Signed-off-by: thomasleung <thomasliang@me.com>