diff --git a/sources b/sources
index 3680668..2430f3e 100644
--- a/sources
+++ b/sources
@@ -1,5 +1 @@
-<<<<<<< HEAD
-SHA512 (pynwb-1.0.2.tar.gz) = 805daea108b48c564083624fa424cc93c34ad23aaaee532551960bf9293154ffe0e4219386a8d9d81c21f46dddf221de4157d443166346dcc804024f41fc2554
-=======
 SHA512 (pynwb-1.0.3.tar.gz) = 3f5476f38234dde1f769c69b0fc44838a8f1185414ea4b119d08cbcf3cbe4076d6c23c76fe889b9ebe4f387e9b14b2c2d2edd2545937b5bd8005527901943bfb
->>>>>>> f30