ERROR: Merging failed in baserock:morphs: please manually merge test/stable into test/feature in this repo and try again.