Fix markdown issue with interword italics

LICENSE

@@ -1,10 +1,6 @@
 The MIT License (MIT)
 
-<<<<<<< HEAD
 Copyright (c) 2016 Protocol Labs Inc.
-=======
-Copyright (c) 2016 Juan Batiz-Benet
->>>>>>> Fixed spelling error, added MIT License file
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -133,6 +133,7 @@ They disagree. :(
 
 ## Disclaimers
 
+<<<<<<< HEAD
 Warning: **obviously multihash values bias the first two bytes**. Do not expect them to be uniformly distributed. The entropy size is `len(multihash) - 2`. Skip the first two bytes when using them with bloom filters, etc. Why not _ap_pend instead of _pre_pend? Because when reading a stream of hashes, you can know the length of the whole value, and allocate the right amount of memory, skip it, or discard it.
 
 ## Visual Examples
@@ -172,6 +173,9 @@ These are visual aids that help tell the story of why Multihash matters.
 ## Maintainers
 
 Captain: [@jbenet](https://github.com/jbenet).
+=======
+Warning: **obviously multihash values bias the first two bytes**. Do not expect them to be uniformly distributed. The entropy size is `len(multihash) - 2`. Skip the first two bytes when using them with bloom filters, etc. Why not _ap_-pend instead of _pre_-pend? Because when reading a stream of hashes, you can know the length of the hash (from the table).
+>>>>>>> Fix markdown issue with interword italics
 
 ## Contribute