Fix react
Fixed conflicts.