fix conflicts in benchmark #42

	name: Build and Deploy Jupyter Book
	on:
	push:
	branches:
	- master
	jobs:
	build-and-deploy:
	if: github.repository == 'PSLmodels/Tax-Calculator'
	runs-on: ubuntu-latest
	steps:
	- name: Checkout
	uses: actions/checkout@v2 # If you're using actions/checkout@v2 you must set persist-credentials to false in most cases for the deployment to work correctly.
	with:
	persist-credentials: false

	- name: Setup Miniconda
	uses: conda-incubator/setup-miniconda@v2
	with:
	activate-environment: taxcalc-dev
	environment-file: environment.yml
	python-version: 3.8
	auto-activate-base: false

	- name: Build # Build Jupyter Book
	shell: bash -l {0}
	run: \|
	pip install jupyter-book
	conda install -c pslmodels behresp
	pip install -e .
	cd docs
	jb build .

	- name: Deploy
	uses: JamesIves/github-pages-deploy-action@releases/v3
	with:
	GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
	BRANCH: gh-pages # The branch the action should deploy to.
	FOLDER: docs/_build/html # The folder the action should deploy.

Provide feedback