fix rebase conflict