Fix issue when GH ruined a merge