fixed merge conflict

.gitignore

count_journal.py

example_input.py

input/README.md

input/__init__.py

input/get/__init__.py

input/get/acs.py

input/get/journal_fetcher.py

input/get/nature.py

input/get/template_.py

input/interface.py

input/publication.py

input/requirements.txt

input/test/__init__.py

input/test/test_acs.py

input/test/test_input.py

input_old/README.md

input_old/__pycache__/input_fj.cpython-39.pyc

input_old/example_urls

input_old/input_fj.py