remove some duplicated content due to a bad merge