add ghost
fixing conflicts