another fix for the merge