Fixing conflicts again