fixing fresh
fixing conflicts