Fix docker, merge conflicts and publish docker images on tag

Fix docker, merge conflicts and publish docker images on tag #933