# Conflicts: # docs/main/first_principle_thinking/2_hardware_badly_used.md # docs/main/geoaware/solution.md # docs/main/introduction.md
update branch to fit with main