Remove conflic indicators, fixed include.