From fdda66f05579d65578b87b78f43436fdcb65ab4c Mon Sep 17 00:00:00 2001
From: Mohamed Hegazy <mhegazy@microsoft.com>
Date: Thu, 13 Aug 2015 12:45:26 -0700
Subject: [PATCH] handel merge conflict, use refPos instead of start

---
 src/compiler/program.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/compiler/program.ts b/src/compiler/program.ts
index cd63aa93893..835cd004d3d 100644
--- a/src/compiler/program.ts
+++ b/src/compiler/program.ts
@@ -406,7 +406,7 @@ namespace ts {
 
             if (diagnostic) {
                 if (refFile !== undefined && refEnd !== undefined && refPos !== undefined) {
-                    diagnostics.add(createFileDiagnostic(refFile, start, refEnd - refPos, diagnostic, ...diagnosticArgument));
+                    diagnostics.add(createFileDiagnostic(refFile, refPos, refEnd - refPos, diagnostic, ...diagnosticArgument));
                 }
                 else {
                     diagnostics.add(createCompilerDiagnostic(diagnostic, ...diagnosticArgument));