Fixed merge error
Fixed merge error

hdeshev/NativeScript,NativeScript/NativeScript,NativeScript/NativeScript,hdeshev/NativeScript,NativeScript/NativeScript,genexliu/NativeScript,hdeshev/NativeScript,NativeScript/NativeScript,genexliu/NativeScript,NativeScript/NativeScript,genexliu/NativeScript