Fix linter errors

types/intercom-client/User.d.ts

@@ -9,9 +9,9 @@ export interface Avatar {
 
 export interface SocialProfile {
     "name": "Twitter",
-    readonly "id": string,
-    "username": "th1sland",
-    "url": "http://twitter.com/th1sland"
+    readonly "id": string | null,
+    "username": string | null,
+    "url": string | null
 }
 
 export interface Segment {

types/intercom-client/index.d.ts

@@ -3,13 +3,9 @@
 // Definitions by: Jinesh Shah <https://github.com/jineshshah36>, Josef Hornych <https://github.com/peping>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.1
-
 import { List as UserList, User, UserIdentifier } from './User';
 import { Scroll } from './Scroll';
 
-import {List as UserList, User, UserIdentifier} from './User';
-import {Scroll} from './Scroll';
-
 export interface IdentityVerificationOptions {
     secretKey: string;
     identifier: string;
@@ -19,40 +15,6 @@ export const IdentityVerification: {
     userHash(opts: IdentityVerificationOptions): string;
 };
 
-<<<<<<< HEAD
-
-export declare class Client {
-    constructor(auth: { token: string });
-    constructor(username: string, password: string);
-    constructor(auth: { appId: string, appApiKey: string });
-    
-    users: Users;
-}
-
-
-interface Company {
-    readonly "id": string
-}
-
-
-declare class Users {
-    create(user: Partial<User>): Promise<User>
-
-    update(user: UserIdentifier & Partial<User> ): Promise<User>
-
-    find(identifier: UserIdentifier): Promise<User>
-
-    list(): Promise<UserList>
-
-    listBy(params: {tag_id: string, segment_id: string}): Promise<UserList>
-
-    scroll: Scroll<User>
-
-    archive(): Promise<User>
-
-    requestPermanentDeletion(): Promise<{id: number}>
-}
-=======
 export class Client {
     constructor(auth: { token: string } | { appId: string, appApiKey: string });
     constructor(username: string, password: string);
@@ -81,4 +43,3 @@ export class Users {
 
     requestPermanentDeletion(): Promise<{id: number}>;
 }
->>>>>>> tmp