fix leftover conflict markers from pull-request