cleanup bad merge