more setup, adding react
merge