fix previous bad merge