halfway though changes
fixing conflicts