more translation conflicts fixed.