Fixing conflicts... for real
And again