fix for merge gone bad