Fixing conflicts2