fix compilation

quic/core/http/quic_spdy_session.cc

diff --git a/quic/core/http/quic_spdy_session.cc b/quic/core/http/quic_spdy_session.cc
index acc42d8..52ff583 100644
--- a/quic/core/http/quic_spdy_session.cc
+++ b/quic/core/http/quic_spdy_session.cc
@@ -9,21 +9,6 @@
 #include <string>
 #include <utility>
 
-<<<<<<<
-|||||||
-#include "net/third_party/quic/core/http/quic_headers_stream.h"
-#include "net/third_party/quic/core/quic_utils.h"
-#include "net/third_party/quic/platform/api/quic_bug_tracker.h"
-#include "net/third_party/quic/platform/api/quic_fallthrough.h"
-#include "net/third_party/quic/platform/api/quic_flag_utils.h"
-=======
-#include "net/third_party/quic/core/http/quic_headers_stream.h"
-#include "net/third_party/quic/core/quic_utils.h"
-#include "net/third_party/quic/core/quic_versions.h"
-#include "net/third_party/quic/platform/api/quic_bug_tracker.h"
-#include "net/third_party/quic/platform/api/quic_fallthrough.h"
-#include "net/third_party/quic/platform/api/quic_flag_utils.h"
->>>>>>>
 #include "net/third_party/quiche/src/quic/core/http/quic_headers_stream.h"
 #include "net/third_party/quiche/src/quic/core/quic_utils.h"
 #include "net/third_party/quiche/src/quic/platform/api/quic_bug_tracker.h"

quic/core/http/quic_spdy_session.h

diff --git a/quic/core/http/quic_spdy_session.h b/quic/core/http/quic_spdy_session.h
index 43b4cb1..698a5ae 100644
--- a/quic/core/http/quic_spdy_session.h
+++ b/quic/core/http/quic_spdy_session.h
@@ -9,22 +9,8 @@
 #include <memory>
 #include <string>
 
-<<<<<<<
-|||||||
-#include "net/third_party/quic/core/http/quic_header_list.h"
-#include "net/third_party/quic/core/http/quic_headers_stream.h"
-#include "net/third_party/quic/core/http/quic_spdy_stream.h"
-#include "net/third_party/quic/core/qpack/qpack_decoder.h"
-#include "net/third_party/quic/core/qpack/qpack_decoder_stream_sender.h"
-=======
-#include "net/third_party/quic/core/http/quic_header_list.h"
-#include "net/third_party/quic/core/http/quic_headers_stream.h"
-#include "net/third_party/quic/core/http/quic_receive_control_stream.h"
-#include "net/third_party/quic/core/http/quic_send_control_stream.h"
-#include "net/third_party/quic/core/http/quic_spdy_stream.h"
-#include "net/third_party/quic/core/qpack/qpack_decoder.h"
-#include "net/third_party/quic/core/qpack/qpack_decoder_stream_sender.h"
->>>>>>>
+#include "net/third_party/quiche/src/quic/core/http/quic_receive_control_stream.h"
+#include "net/third_party/quiche/src/quic/core/http/quic_send_control_stream.h"
 #include "net/third_party/quiche/src/quic/core/http/quic_header_list.h"
 #include "net/third_party/quiche/src/quic/core/http/quic_headers_stream.h"
 #include "net/third_party/quiche/src/quic/core/http/quic_spdy_stream.h"

quic/core/quic_dispatcher.cc

diff --git a/quic/core/quic_dispatcher.cc b/quic/core/quic_dispatcher.cc
index fa995da..7bfa217 100644
--- a/quic/core/quic_dispatcher.cc
+++ b/quic/core/quic_dispatcher.cc
@@ -19,20 +19,10 @@
 #include "net/third_party/quiche/src/quic/platform/api/quic_flag_utils.h"
 #include "net/third_party/quiche/src/quic/platform/api/quic_flags.h"
 #include "net/third_party/quiche/src/quic/platform/api/quic_logging.h"
-<<<<<<<
 #include "net/third_party/quiche/src/quic/platform/api/quic_ptr_util.h"
 #include "net/third_party/quiche/src/quic/platform/api/quic_stack_trace.h"
 #include "net/third_party/quiche/src/quic/platform/api/quic_string_piece.h"
-|||||||
-#include "net/third_party/quic/platform/api/quic_ptr_util.h"
-#include "net/third_party/quic/platform/api/quic_stack_trace.h"
-#include "net/third_party/quic/platform/api/quic_string_piece.h"
-=======
-#include "net/third_party/quic/platform/api/quic_ptr_util.h"
-#include "net/third_party/quic/platform/api/quic_stack_trace.h"
-#include "net/third_party/quic/platform/api/quic_string_piece.h"
-#include "net/third_party/quic/platform/api/quic_text_utils.h"
->>>>>>>
+#include "net/third_party/quiche/src/quic/platform/api/quic_text_utils.h"
 
 namespace quic {