Fix rebase conflicts