Fix rebase conflicts from master