Fixed conflict in settings/base
Fixed conflict in settings/base

wbg-optronix-lab/emergence-lab,emergence-lab/emergence-lab,wbg-optronix-lab/emergence-lab,emergence-lab/emergence-lab,emergence-lab/emergence-lab,wbg-optronix-lab/emergence-lab