Attempting to fix bad merge