Fixed conflicts from upstream