fix conflict in rebase