diff --git a/ch01.asciidoc b/ch01.asciidoc
index 0a74dc03..b29a427e 100644
--- a/ch01.asciidoc
+++ b/ch01.asciidoc
@@ -132,7 +132,6 @@ Alice is now ready to start using her new bitcoin web-wallet.
 [[getting_first_bitcoin]]
 ==== Getting your first bitcoins
 
-<<<<<<< HEAD
 It is not possible to buy bitcoins at a bank or foreign exchange kiosks at this time. It is not possible to use a credit card to buy bitcoins, either. As of 2014, it is still quite difficult to acquire bitcoins in most countries. There are a number of specialized currency exchanges where you can buy and sell bitcoin in exchange for a local currency. These operate as web-based currency markets and include:
 
 * Bitstamp (bitstamp.net), a European currency market that supports several currencies including euros (EUR) and US dollars (USD) via wire transfer