More conflicts - locale js rebuilding.