Fix the merge conflicts

Author: sheetalkamat

Diff for: src/compiler/checker.ts

@@ -4395,7 +4395,8 @@ module ts {
             // That helps in making sure not assigning types as any when resolved out of order
             var containerNodes: Node[] = [];
             for (var parent = node.parent; parent; parent = parent.parent) {
-                if (isExpression(parent) && isContextSensitiveExpression(<Expression>parent)) {
+                if ((isExpression(parent) || isObjectLiteralMethod(node)) &&
+                    isContextSensitive(<Expression>parent)) {
                     containerNodes.unshift(parent);
                 }
             }

Diff for: src/harness/typeWriter.ts

@@ -94,7 +94,7 @@ class TypeWriterWalker {
     }
 
     private getTypeOfNode(node: ts.Node): ts.Type {
-        var type = this.checker.getTypeOfLocation(node);
+        var type = this.checker.getTypeAtLocation(node);
         ts.Debug.assert(type !== undefined, "type doesn't exist");
         return type;
     }

Diff for: tests/baselines/reference/callExpressionWithMissingTypeArgument1.errors.txt

@@ -4,7 +4,7 @@ tests/cases/compiler/callExpressionWithMissingTypeArgument1.ts(1,1): error TS230
 
 ==== tests/cases/compiler/callExpressionWithMissingTypeArgument1.ts (2 errors) ====
     Foo<a,,b>();
-          
+          ~
 !!! error TS1110: Type expected.
     ~~~
 !!! error TS2304: Cannot find name 'Foo'.