start removing --bugfix from everywhere and add checkout command instead