fix for a bad merge