remove weird rebase artifact