diff --git a/scripts/docs/templates/common.template.html b/scripts/docs/templates/common.template.html
index 496ac51ec..26bc1b398 100644
--- a/scripts/docs/templates/common.template.html
+++ b/scripts/docs/templates/common.template.html
@@ -165,7 +165,7 @@ docType: "<$ doc.docType $>"
 <@ endif @>
 
 <# --- Install commands --- #>
-<pre><code class="nohighlight">$ <@ if prop.install @><$ prop.install $><@ else @>ionic plugin add --save <$ prop.plugin $><@ endif @>
+<pre><code class="nohighlight">$ <@ if prop.install @><$ prop.install $><@ else @>ionic cordova plugin add <$ prop.plugin $><@ endif @>
 $ npm install --save @ionic-native/<$ doc.npmId $>
 </code></pre>
 <p>Repo:
diff --git a/src/@ionic-native/plugins/printer/index.ts b/src/@ionic-native/plugins/printer/index.ts
index a5ccd264d..3705703a5 100644
--- a/src/@ionic-native/plugins/printer/index.ts
+++ b/src/@ionic-native/plugins/printer/index.ts
@@ -71,7 +71,7 @@ export interface PrintOptions {
   pluginName: 'Printer',
   plugin: 'de.appplant.cordova.plugin.printer',
   pluginRef: 'cordova.plugins.printer',
-  repo: 'https://github.com/katzer/cordova-plugin-printer.git',
+  repo: 'https://github.com/katzer/cordova-plugin-printer',
   platforms: ['Android', 'iOS']
 })
 @Injectable()
diff --git a/src/@ionic-native/plugins/secure-storage/index.ts b/src/@ionic-native/plugins/secure-storage/index.ts
index 7a9a1a82c..9c7fd1204 100644
--- a/src/@ionic-native/plugins/secure-storage/index.ts
+++ b/src/@ionic-native/plugins/secure-storage/index.ts
@@ -6,7 +6,7 @@ import { CordovaInstance, Plugin, CordovaCheck, IonicNativePlugin } from '@ionic
  */
 export class SecureStorageObject {
 
-  constructor(private _objectInstance?: any) { }
+  constructor(private _objectInstance: any) { }
 
   /**
    * Gets a stored item
@@ -120,8 +120,17 @@ export class SecureStorage extends IonicNativePlugin {
    */
   @CordovaCheck()
   create(store: string): Promise<SecureStorageObject> {
+<<<<<<< HEAD
     return new Promise((res: Function, rej: Function) => {
       const instance = new (SecureStorage.getPlugin())(() => res(new SecureStorageObject(instance)), rej, store);
+=======
+    return new Promise((res, rej) => {
+      if (checkAvailability('cordova.plugins.SecureStorage', null, 'SecureStorage') === true) {
+        const instance = new cordova.plugins.SecureStorage(() => res(new SecureStorageObject(instance)), rej, store);
+      } else {
+        rej('SecureStorage failure: cordova plugin is not available');
+      }
+>>>>>>> 5145395dd7bea7d2fb81b11b356a4a7497c607e7
     });
   }