Fixing earlier merge