diff --git a/.gitignore b/.gitignore
index ff3dd23..1b45af7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,3 @@
 /terminal_size-0.1.8.crate
-<<<<<<< HEAD
 /terminal_size-0.1.9.crate
-=======
 /terminal_size-0.1.10.crate
->>>>>>> Update to 0.1.10
diff --git a/sources b/sources
index fde56e3..1b1e271 100644
--- a/sources
+++ b/sources
@@ -1,5 +1 @@
-<<<<<<< HEAD
-SHA512 (terminal_size-0.1.9.crate) = b3e5d840bf33cb49294995d6d1300facba540804b65648c9b77612ebb28baef3eb28477b2aac3048bba66ed51b2afc12fad436677f5221f8ddecfaf2af163a88
-=======
 SHA512 (terminal_size-0.1.10.crate) = ebe617c7329d34270b254d58c107ff941381cc18222a8f9a32e5fe937715de64269d336fdf49caeaa0afc8b88955c402c9650d74af3276f3694f286282400d85
->>>>>>> Update to 0.1.10