gc - fixing weird merge conflict message