fix leftover conflict markers from pull-request
fix leftover conflict markers from pull-request

meejah/txtorcon,david415/txtorcon,sammyshj/txtorcon,ghtdak/txtorcon,meejah/txtorcon,isislovecruft/txtorcon,david415/txtorcon,ghtdak/txtorcon,isislovecruft/txtorcon,sammyshj/txtorcon