fix left over merge indicator