diff --git a/PROMS/Sync/Sync/FileCompare.cs b/PROMS/Sync/Sync/FileCompare.cs
index c570f580..44b9878e 100644
--- a/PROMS/Sync/Sync/FileCompare.cs
+++ b/PROMS/Sync/Sync/FileCompare.cs
@@ -51,6 +51,12 @@ namespace Sync
 		{
 			get { return _ReadOnly; }
 		}
+		private bool _Merge = false;
+		public bool Merge
+		{
+			get { return _Merge; }
+			set { _Merge = value; }
+		}
 		public FileCompare(FileInfo development, FileInfo sourceSafe)
 		{
 			_Developement = development;
diff --git a/PROMS/Sync/Sync/frmSync.cs b/PROMS/Sync/Sync/frmSync.cs
index ccfd39d9..c6112fe5 100644
--- a/PROMS/Sync/Sync/frmSync.cs
+++ b/PROMS/Sync/Sync/frmSync.cs
@@ -144,8 +144,11 @@ namespace Sync
 		private void AddToResults(FileInfo fiSS,FileInfo fiDev)
 		{
 			FileCompare fc = new FileCompare(fiDev, fiSS);
+			FileInfo fiMB = new FileInfo(fc.FileName.Replace(tbDevelopment.Text, tbSSMailBox.Text));
+			if (fiMB.Exists && fiSS.LastWriteTimeUtc != fiMB.LastWriteTimeUtc)
+					fc.Merge = true;			
 			//if(!_OnlyContentDifferent || (fc.Different && (fc.DevModified != null)))
-				if (!_OnlyContentDifferent || (fc.Different))
+					if (!_OnlyContentDifferent || (fc.Different))
 					_CheckedOut.Add(fc);
 			//if (tbResults.Text == "") tbResults.Text = "Found:";
 			//tbResults.Text += "\r\n" + fiDev.FullName + " - " + ((fiDev.Attributes & FileAttributes.ReadOnly) != FileAttributes.ReadOnly ? "" : "ReadOnly");