fix erroneous merging of GHW