Fix conflicts from rebase with master