diff --git a/public/app/core/angular_wrappers.ts b/public/app/core/angular_wrappers.ts
index 0b3974e7966..6e68e7c8d2f 100644
--- a/public/app/core/angular_wrappers.ts
+++ b/public/app/core/angular_wrappers.ts
@@ -1,20 +1,16 @@
-import { react2AngularDirective } from "app/core/utils/react2angular";
-import { PasswordStrength } from "./components/PasswordStrength";
-import PageHeader from "./components/PageHeader/PageHeader";
-import EmptyListCTA from "./components/EmptyListCTA/EmptyListCTA";
-import LoginBackground from "./components/Login/LoginBackground";
-import { SearchResult } from "./components/search/SearchResult";
-import UserPicker from "./components/UserPicker/UserPicker";
+import { react2AngularDirective } from 'app/core/utils/react2angular';
+import { PasswordStrength } from './components/PasswordStrength';
+import PageHeader from './components/PageHeader/PageHeader';
+import EmptyListCTA from './components/EmptyListCTA/EmptyListCTA';
+import LoginBackground from './components/Login/LoginBackground';
+import { SearchResult } from './components/search/SearchResult';
+import UserPicker from './components/UserPicker/UserPicker';
 
 export function registerAngularDirectives() {
-  react2AngularDirective("passwordStrength", PasswordStrength, ["password"]);
-  react2AngularDirective("pageHeader", PageHeader, ["model", "noTabs"]);
-  react2AngularDirective("emptyListCta", EmptyListCTA, ["model"]);
-  react2AngularDirective("loginBackground", LoginBackground, []);
-  react2AngularDirective("searchResult", SearchResult, []);
-  react2AngularDirective("userPickerr", UserPicker, [
-    "backendSrv",
-    "teamId",
-    "refreshList"
-  ]);
+  react2AngularDirective('passwordStrength', PasswordStrength, ['password']);
+  react2AngularDirective('pageHeader', PageHeader, ['model', 'noTabs']);
+  react2AngularDirective('emptyListCta', EmptyListCTA, ['model']);
+  react2AngularDirective('loginBackground', LoginBackground, []);
+  react2AngularDirective('searchResult', SearchResult, []);
+  react2AngularDirective('selectUserPicker', UserPicker, ['backendSrv', 'teamId', 'refreshList']);
 }
diff --git a/public/app/core/angular_wrappers.ts.orig b/public/app/core/angular_wrappers.ts.orig
new file mode 100644
index 00000000000..0ae4d981805
--- /dev/null
+++ b/public/app/core/angular_wrappers.ts.orig
@@ -0,0 +1,36 @@
+<<<<<<< HEAD
+import { react2AngularDirective } from "app/core/utils/react2angular";
+import { PasswordStrength } from "./components/PasswordStrength";
+import PageHeader from "./components/PageHeader/PageHeader";
+import EmptyListCTA from "./components/EmptyListCTA/EmptyListCTA";
+import LoginBackground from "./components/Login/LoginBackground";
+import { SearchResult } from "./components/search/SearchResult";
+import UserPicker from "./components/UserPicker/UserPicker";
+
+export function registerAngularDirectives() {
+  react2AngularDirective("passwordStrength", PasswordStrength, ["password"]);
+  react2AngularDirective("pageHeader", PageHeader, ["model", "noTabs"]);
+  react2AngularDirective("emptyListCta", EmptyListCTA, ["model"]);
+  react2AngularDirective("loginBackground", LoginBackground, []);
+  react2AngularDirective("searchResult", SearchResult, []);
+  react2AngularDirective("userPickerr", UserPicker, [
+    "backendSrv",
+    "teamId",
+    "refreshList"
+  ]);
+=======
+import { react2AngularDirective } from 'app/core/utils/react2angular';
+import { PasswordStrength } from './components/PasswordStrength';
+import PageHeader from './components/PageHeader/PageHeader';
+import EmptyListCTA from './components/EmptyListCTA/EmptyListCTA';
+import LoginBackground from './components/Login/LoginBackground';
+import UserPicker from './components/UserPicker/UserPicker';
+
+export function registerAngularDirectives() {
+  react2AngularDirective('passwordStrength', PasswordStrength, ['password']);
+  react2AngularDirective('pageHeader', PageHeader, ['model', 'noTabs']);
+  react2AngularDirective('emptyListCta', EmptyListCTA, ['model']);
+  react2AngularDirective('loginBackground', LoginBackground, []);
+  react2AngularDirective('selectUserPicker', UserPicker, ['backendSrv', 'teamId', 'refreshList']);
+>>>>>>> fix: Rename directive user-pickerr (yes two r's) to select-user-picker
+}
diff --git a/public/app/features/org/partials/team_details.html b/public/app/features/org/partials/team_details.html
index f91c29c3bb3..e2666697869 100644
--- a/public/app/features/org/partials/team_details.html
+++ b/public/app/features/org/partials/team_details.html
@@ -26,18 +26,10 @@
   <div class="gf-form-group">
 
     <h3 class="page-heading">Team Members</h3>
-
-    <form name="ctrl.addMemberForm" class="gf-form-group">
-      <div class="gf-form">
-        <span class="gf-form-label width-10">Add member</span>
-				<user-picker user-picked="ctrl.userPicked($user)"></user-picker>
-      </div>
-    </form>
-
 		<form name="ctrl.addMemberForm" class="gf-form-group">
       <div class="gf-form">
         <span class="gf-form-label width-10">Add member</span>
-				<user-pickerr backendSrv="ctrl.backendSrv" teamId="ctrl.$routeParams.id" refreshList="ctrl.get" teamMembers="ctrl.teamMembers"></user-pickerr>
+				<select-user-picker backendSrv="ctrl.backendSrv" teamId="ctrl.$routeParams.id" refreshList="ctrl.get" teamMembers="ctrl.teamMembers"></select-user-picker>
       </div>
     </form>