removed left over merge thing