Fix broken rebase
Merge pull request #30 from NativeScript/fatme/fix-broken-rebase

Fix broken rebase