resolve conflicts

README.md

UPDATES.md

configs/training.py

docs/inference.md

docs/multi_gpu.md

docs/single_gpu.md

ft_datasets/alpaca_dataset.py

inference/chat_completion.py

inference/chat_utils.py

inference/chats.json

inference/inference.py

llama_finetuning.py

requirements.txt

scripts/spellcheck.sh

scripts/spellcheck_conf/wordlist.txt

utils/train_utils.py