diff --git a/.gitignore b/.gitignore
index b5dd34f457..8c332a0268 100644
--- a/.gitignore
+++ b/.gitignore
@@ -287,3 +287,9 @@ cscope.files
 cscope.out
 cscope.in.out
 cscope.po.out
+
+#tortoisegit stale temp files when resolving merge conflicts
+*BASE_*
+*LOCAL_*
+*REMOTE_*
+*.orig
\ No newline at end of file
diff --git a/custom.props b/custom.props
index 604aa197a8..1b1537b12c 100644
--- a/custom.props
+++ b/custom.props
@@ -4,7 +4,7 @@
     <VersionMajor>1</VersionMajor>
     <VersionMinor>2</VersionMinor>
     <!-- The nuget package version should be incremented when we produce QFEs -->
-    <NuGetPackVersion>1.2.5</NuGetPackVersion>
+    <NuGetPackVersion>1.2.6</NuGetPackVersion>
     <VersionInfoProductName>AdaptiveCards</VersionInfoProductName>
   </PropertyGroup>
 </Project>