Rebase conflict in api