git told me to
Merge branch 'master' of https://github.com/oschobel/macotec
git
git
Merge branch 'master' of https://github.com/oschobel/macotec

Conflicts:
	build.yml
Merge branch 'master' of https://github.com/oschobel/macotec
Merge branch 'master' of https://github.com/oschobel/macotec
removed merge conflict
Merge branch 'master' of https://github.com/oschobel/macotec
Merge branch 'master' of https://github.com/oschobel/macotec
Latest changes for release